Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed issue with godot's changes to polypartition third-party code #58376

Merged
merged 1 commit into from
Feb 21, 2022
Merged

Fixed issue with godot's changes to polypartition third-party code #58376

merged 1 commit into from
Feb 21, 2022

Conversation

novaplusplus
Copy link
Contributor

@novaplusplus novaplusplus commented Feb 21, 2022

See #58365

I am unsure where or if this function gets called in the engine, but it may have caused #53808 as well

Bugsquad edit:

Copy link
Member

@fire fire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My code review shows this is a bug, not sure the implications though.

@akien-mga
Copy link
Member

Looks good. Could you also update the patch file while documents these modifications? You should be able to just add the missing assignment in place without having to redo the patch:

+ for (iter2 = polys.front(); iter2; iter2->next()) {

Please do so by amending the commit with git commit --amend to keep both changes together (see PR workflow).

@akien-mga akien-mga added this to the 4.0 milestone Feb 21, 2022
@akien-mga akien-mga added cherrypick:3.4 cherrypick:3.x Considered for cherry-picking into a future 3.x release and removed cherrypick:3.x Considered for cherry-picking into a future 3.x release cherrypick:3.4 labels Feb 21, 2022
@novaplusplus
Copy link
Contributor Author

I'll try and get it sorted tomorrow. Sorry if it takes me a bit, this is quite literally my first time doing a PR for anything

@Xrayez
Copy link
Contributor

Xrayez commented Feb 21, 2022

Why not cherry-pick? This causes a problem in Goost as well (where some polypartition functions are exposed in Godot 3.x):

https://github.com/goostengine/goost/blob/52ebb330aa6752552bd9ab1cee0f854e57657992/core/math/geometry/2d/poly/decomp/polypartition/poly_decomp_polypartition.cpp#L100-L104

@akien-mga
Copy link
Member

Why not cherry-pick? This causes a problem in Goost as well (where some polypartition functions are exposed in Godot 3.x):

goostengine/goost@52ebb33/core/math/geometry/2d/poly/decomp/polypartition/poly_decomp_polypartition.cpp#L100-L104

#48921 wasn't cherry-picked, so the regression doesn't seem to exist in 3.x.

I don't see any missing iter* = in thirdparty/misc/triangulator.cpp in 3.x.

@novaplusplus
Copy link
Contributor Author

Ok, I think that did it.

@akien-mga akien-mga merged commit 4e5cc1f into godotengine:master Feb 21, 2022
@akien-mga
Copy link
Member

Thanks! And congrats for your first merged Godot contribution 🎉

@novaplusplus
Copy link
Contributor Author

One little followup - I notice in the commit log it says "Nova" with no avatar and no link to my profile. I think I might have not linked my ssh keys up with github properly or something... Not sure what happened there.

@akien-mga
Copy link
Member

You authored that commit without any email information indeed, see https://github.com/godotengine/godot/commit/36ae916c09181c252e679d6d3bae38ac7a446204.patch

You might want to fix your Git config for future commits so that you can be identified as the author.

@novaplusplus
Copy link
Contributor Author

Oh well... I'll fix it for next time I guess.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants